package git;

/**
 * @Author:云尚
 * @Description:
 */
public class GitTest {
    public static void main(String[] args) {
        System.out.println("测试git代码");
        System.out.println("追加内容");
        System.out.println("branch01分支代码");
        System.out.println("==========测试冲突分支代码==========");
        System.out.println("========测试分支冲突，branch01分支代码=====");

    }
}
